Fix Particle Definition Conflicts #6760
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
APickledWalrus
added
the
bug
UnderscoreTud
approved these changes
Jun 3, 2024
Moderocky
approved these changes
Jun 3, 2024
|
Can we get a specific regression test for this? |
This is needed as firework may also represent an entitydata.
APickledWalrus
added
the
needs testing
sovdeeth
approved these changes
Jun 3, 2024
It is 1.14+
sovdeeth
added
the
patch-ready
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR aims to fix some particle-itemtype conflicts that were introduced in #6716
For example, some inputs such as
totem of undyingwould parse as a visual effect rather than an itemtype. This caused errors with variables as visual effect serialization is broken. To combat this, I've made it so that visual effects are parsed after item types. Additionally, I've added some additional optional keywords to the affected particle definitions.We might also prefer a more aggressive route of requiring the usage of keywords like
particle. I wanted to avoid this if possible. We may choose to pursue this if the parse-order changes reveal any unexpected issues.There is one breaking change that affects the
elder guardianoption that was added in 2.8.5. It now requiresparticle. I attempted to force visual effect parsing after entity types/data, but that caused unexpected test failures.Target Minecraft Versions: any
Requirements: none
Related Issues: #6774